From: Amir E. Aharoni Date: Sat, 4 Oct 2014 13:50:57 +0000 (+0300) Subject: mediawiki.language: Respect $wgTranslateNumerals in convertNumber() X-Git-Tag: 1.31.0-rc.0~11323^2 X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=56bcd86d83e6159568fb6e3bf72d0d92162bdc31;p=lhc%2Fweb%2Fwiklou.git mediawiki.language: Respect $wgTranslateNumerals in convertNumber() This commit exposes the $wgTranslateNumerals variable via mw.config. Bug: T72109 Change-Id: Id84ecc0a23aa83041f44294f249af28b92a1e629 --- diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25 index f5cec5454e..e74f226581 100644 --- a/RELEASE-NOTES-1.25 +++ b/RELEASE-NOTES-1.25 @@ -193,6 +193,7 @@ production. * $wgUseTidy is now set when parserTests are run with the tidy option to match output on wiki. * (T37472) update.php will purge ResourceLoader cache unless --nopurge is passed to it. +* (T72109) mediawiki.language should respect $wgTranslateNumerals in convertNumber(). === Action API changes in 1.25 === * (T67403) XML tag highlighting is now only performed for formats diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index 48b357653d..b2fbae9c1c 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -82,6 +82,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { 'wgServerName' => $conf->get( 'ServerName' ), 'wgUserLanguage' => $context->getLanguage(), 'wgContentLanguage' => $wgContLang->getCode(), + 'wgTranslateNumerals' => $conf->get( 'TranslateNumerals' ), 'wgVersion' => $conf->get( 'Version' ), 'wgEnableAPI' => $conf->get( 'EnableAPI' ), 'wgEnableWriteAPI' => $conf->get( 'EnableWriteAPI' ), diff --git a/resources/src/mediawiki.language/mediawiki.language.numbers.js b/resources/src/mediawiki.language/mediawiki.language.numbers.js index c7f150f942..3c13055b7f 100644 --- a/resources/src/mediawiki.language/mediawiki.language.numbers.js +++ b/resources/src/mediawiki.language/mediawiki.language.numbers.js @@ -189,6 +189,10 @@ transformTable = tmp; numberString = String( num ); } else { + // Ignore transform table if wgTranslateNumerals is false + if ( !mw.config.get( 'wgTranslateNumerals' ) ) { + transformTable = []; + } numberString = mw.language.commafy( num, pattern ); }